linux: Remove a few redundant config options. Build util.c for ia64

and ifdef out a couple of functions that are not yet fully generic.
Signed-off-by: Keir Fraser <keir@xensource.com>

diff --git a/linux-2.6-xen-sparse/arch/ia64/Kconfig b/linux-2.6-xen-sparse/arch/ia64/Kconfig
index e4f4a6431a4943e00d4ba470f97c9e9cb62d87fd..e665b7c391ab2365281afac83e76b7e991d554f9 100644 (file)
--- a/linux-2.6-xen-sparse/arch/ia64/Kconfig
+++ b/linux-2.6-xen-sparse/arch/ia64/Kconfig
@@ -576,15 +576,6 @@ source "crypto/Kconfig"
 # override default values of drivers/xen/Kconfig
 #
 if XEN
-config XEN_UTIL
-       default n
-
-config XEN_BALLOON
-       default y
-
-config XEN_REBOOT
-       default y
-
 config XEN_SMPBOOT
        default n
 endif

diff --git a/linux-2.6-xen-sparse/drivers/xen/Kconfig b/linux-2.6-xen-sparse/drivers/xen/Kconfig
index 71ba9f264d7946b52f98baf015e028cd1e4e8704..f08e2b8aef8fbdd9347ea25f3c213d7ef5d3e43d 100644 (file)
--- a/linux-2.6-xen-sparse/drivers/xen/Kconfig
+++ b/linux-2.6-xen-sparse/drivers/xen/Kconfig
@@ -253,22 +253,6 @@ config NO_IDLE_HZ
        bool
        default y
 
-config XEN_UTIL
-       bool
-       default y
-
-config XEN_BALLOON
-       bool
-       default y
-
-config XEN_DEVMEM
-       bool
-       default y
-
-config XEN_REBOOT
-       bool
-       default y
-
 config XEN_SMPBOOT
        bool
        default y

diff --git a/linux-2.6-xen-sparse/drivers/xen/Makefile b/linux-2.6-xen-sparse/drivers/xen/Makefile
index c7d66d139eac64153d87294b2390f2be3404b44c..f453f8ecf55a33130d7a8df2b6ea0130b960b023 100644 (file)
--- a/linux-2.6-xen-sparse/drivers/xen/Makefile
+++ b/linux-2.6-xen-sparse/drivers/xen/Makefile
@@ -4,10 +4,10 @@ obj-y += evtchn/
 obj-y  += privcmd/
 obj-y  += xenbus/
 obj-y  += gntdev/
+obj-y  += balloon/
+obj-y  += char/
 
-obj-$(CONFIG_XEN_UTIL)                 += util.o
-obj-$(CONFIG_XEN_BALLOON)              += balloon/
-obj-$(CONFIG_XEN_DEVMEM)               += char/
+obj-y  += util.o
 obj-$(CONFIG_XEN_BLKDEV_BACKEND)       += blkback/
 obj-$(CONFIG_XEN_BLKDEV_TAP)           += blktap/
 obj-$(CONFIG_XEN_NETDEV_BACKEND)       += netback/

diff --git a/linux-2.6-xen-sparse/drivers/xen/core/Makefile b/linux-2.6-xen-sparse/drivers/xen/core/Makefile
index 064105443e4d30befcf5ee9eb16bff5d8b097b4d..95122cbf463a0866d003f293decdced2e3116ad1 100644 (file)
--- a/linux-2.6-xen-sparse/drivers/xen/core/Makefile
+++ b/linux-2.6-xen-sparse/drivers/xen/core/Makefile
@@ -2,12 +2,11 @@
 # Makefile for the linux kernel.
 #
 
-obj-y := evtchn.o gnttab.o features.o
+obj-y := evtchn.o gnttab.o features.o reboot.o machine_reboot.o
 
 obj-$(CONFIG_PROC_FS)          += xen_proc.o
 obj-$(CONFIG_SYSFS)            += hypervisor_sysfs.o
 obj-$(CONFIG_HOTPLUG_CPU)      += cpu_hotplug.o
 obj-$(CONFIG_XEN_SYSFS)                += xen_sysfs.o
-obj-$(CONFIG_XEN_REBOOT)       += reboot.o machine_reboot.o
 obj-$(CONFIG_XEN_SMPBOOT)      += smpboot.o
 obj-$(CONFIG_KEXEC)            += machine_kexec.o

diff --git a/linux-2.6-xen-sparse/drivers/xen/util.c b/linux-2.6-xen-sparse/drivers/xen/util.c
index 922c201abd1ccd9d52e03b3cc325b253a687ae17..f9da5273f7206e3a502ac8c274ca9da80208e0d9 100644 (file)
--- a/linux-2.6-xen-sparse/drivers/xen/util.c
+++ b/linux-2.6-xen-sparse/drivers/xen/util.c
@@ -22,6 +22,9 @@ struct class *get_xen_class(void)
 }
 EXPORT_SYMBOL_GPL(get_xen_class);
 
+/* Todo: merge ia64 ('auto-translate physmap') versions of these functions. */
+#ifndef __ia64__
+
 static int f(pte_t *pte, struct page *pmd_page, unsigned long addr, void *data)
 {
        /* apply_to_page_range() does all the hard work. */
@@ -63,3 +66,5 @@ void free_vm_area(struct vm_struct *area)
        kfree(area);
 }
 EXPORT_SYMBOL_GPL(free_vm_area);
+
+#endif /* !__ia64__ */